Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Mar 2012 08:13:52 +0000 (01:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Mar 2012 08:13:52 +0000 (01:13 -0700)

Trivial merge